From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 7 Mar 1993 23:43:52 +0000 (+0000)
Subject: Include intervals.h.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96999
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=497ba7a108c7252ff6ea1667109066f66a52881a;p=emacs.git

Include intervals.h.
(read_key_sequence): Use get_local_map.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 6c664169f03..a222a026723 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -35,6 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "disptab.h"
 #include "dispextern.h"
 #include "keyboard.h"
+#include "intervals.h"
 #include <setjmp.h>
 #include <errno.h>
 
@@ -3223,7 +3224,11 @@ read_key_sequence (keybuf, bufsize, prompt)
 	nmaps_allocated = nmaps;
       }
     bcopy (maps, submaps, (nmaps - 2) * sizeof (submaps[0]));
-    submaps[nmaps-2] = current_buffer->keymap;
+#ifdef USE_TEXT_PROPERTIES
+    submaps[nmaps-2] = get_local_map (PT, current_buffer);
+#else
+    submaps[nmaps-2] = current_buffer->local_map;
+#endif
     submaps[nmaps-1] = global_map;
   }